home *** CD-ROM | disk | FTP | other *** search
| Emacs Compiled Lisp | 1998-05-21 | 5.8 KB |
open in: 
MacOS 8.1
|
Win98
|
DOS
view JSON data
|
view as text
This file was processed as: Emacs Compiled Lisp
(other/emacsCompiledLisp).
This format is not currently supported by dexvert.
| Confidence | Program | Detection | Match Type | Support
|
|---|
| 1%
| dexvert
| Emacs Compiled Lisp (other/emacsCompiledLisp)
| magic
| Unsupported |
| 100%
| file
| Emacs/XEmacs v20 byte-compiled Lisp data
| default
| |
| 99%
| file
| data
| default
| |
| 100%
| TrID
| Emacs/XEmacs byte-compiled Lisp (generic)
| default
|
|
hex view+--------+-------------------------+-------------------------+--------+--------+
|00000000| 3b 45 4c 43 14 00 00 00 | 0a 3b 3b 3b 20 63 6f 6d |;ELC....|.;;; com|
|00000010| 70 69 6c 65 64 20 62 79 | 20 6a 75 73 74 69 6e 62 |piled by| justinb|
|00000020| 40 65 62 6f 6e 79 2e 63 | 72 61 79 2e 63 6f 6d 20 |@ebony.c|ray.com |
|00000030| 6f 6e 20 4d 6f 6e 20 4d | 61 72 20 20 39 20 31 32 |on Mon M|ar 9 12|
|00000040| 3a 34 38 3a 33 38 20 31 | 39 39 38 0a 3b 3b 3b 20 |:48:38 1|998.;;; |
|00000050| 66 72 6f 6d 20 66 69 6c | 65 20 2f 68 6f 6d 65 2f |from fil|e /home/|
|00000060| 61 73 70 65 6e 30 37 2f | 6a 75 73 74 69 6e 62 2f |aspen07/|justinb/|
|00000070| 72 6f 6f 74 73 2f 66 72 | 65 65 77 61 72 65 2f 78 |roots/fr|eeware/x|
|00000080| 65 6d 61 63 73 2f 32 30 | 2e 33 2f 78 65 6d 61 63 |emacs/20|.3/xemac|
|00000090| 73 2d 32 30 2e 33 2f 6c | 69 73 70 2f 65 64 69 66 |s-20.3/l|isp/edif|
|000000a0| 66 2f 65 64 69 66 66 2d | 76 65 72 73 2e 65 6c 0a |f/ediff-|vers.el.|
|000000b0| 3b 3b 3b 20 65 6d 61 63 | 73 20 76 65 72 73 69 6f |;;; emac|s versio|
|000000c0| 6e 20 32 30 2e 34 20 22 | 45 6d 65 72 61 6c 64 22 |n 20.4 "|Emerald"|
|000000d0| 20 58 45 6d 61 63 73 20 | 20 4c 75 63 69 64 2e 0a | XEmacs | Lucid..|
|000000e0| 3b 3b 3b 20 62 79 74 65 | 63 6f 6d 70 20 76 65 72 |;;; byte|comp ver|
|000000f0| 73 69 6f 6e 20 32 2e 32 | 35 20 58 45 6d 61 63 73 |sion 2.2|5 XEmacs|
|00000100| 3b 20 32 32 2d 4d 61 72 | 2d 39 36 2e 0a 3b 3b 3b |; 22-Mar|-96..;;;|
|00000110| 20 6f 70 74 69 6d 69 7a | 61 74 69 6f 6e 20 69 73 | optimiz|ation is|
|00000120| 20 6f 6e 2e 0a 3b 3b 3b | 20 74 68 69 73 20 66 69 | on..;;;| this fi|
|00000130| 6c 65 20 75 73 65 73 20 | 6f 70 63 6f 64 65 73 20 |le uses |opcodes |
|00000140| 77 68 69 63 68 20 64 6f | 20 6e 6f 74 20 65 78 69 |which do| not exi|
|00000150| 73 74 20 69 6e 20 45 6d | 61 63 73 20 31 39 2e 0a |st in Em|acs 19..|
|00000160| 0a 28 69 66 20 28 61 6e | 64 20 28 62 6f 75 6e 64 |.(if (an|d (bound|
|00000170| 70 20 27 65 6d 61 63 73 | 2d 76 65 72 73 69 6f 6e |p 'emacs|-version|
|00000180| 29 0a 09 20 28 6f 72 20 | 28 61 6e 64 20 28 62 6f |).. (or |(and (bo|
|00000190| 75 6e 64 70 20 27 65 70 | 6f 63 68 3a 3a 76 65 72 |undp 'ep|och::ver|
|000001a0| 73 69 6f 6e 29 20 65 70 | 6f 63 68 3a 3a 76 65 72 |sion) ep|och::ver|
|000001b0| 73 69 6f 6e 29 0a 09 20 | 20 20 20 20 28 73 74 72 |sion).. | (str|
|000001c0| 69 6e 67 2d 6c 65 73 73 | 70 20 65 6d 61 63 73 2d |ing-less|p emacs-|
|000001d0| 76 65 72 73 69 6f 6e 20 | 22 32 30 22 29 29 29 0a |version |"20"))).|
|000001e0| 20 20 20 20 28 65 72 72 | 6f 72 20 22 60 65 64 69 | (err|or "`edi|
|000001f0| 66 66 2d 76 65 72 73 2e | 65 6c 27 20 77 61 73 20 |ff-vers.|el' was |
|00000200| 63 6f 6d 70 69 6c 65 64 | 20 66 6f 72 20 45 6d 61 |compiled| for Ema|
|00000210| 63 73 20 32 30 22 29 29 | 0a 0a 28 6f 72 20 28 62 |cs 20"))|..(or (b|
|00000220| 6f 75 6e 64 70 20 27 63 | 75 72 72 65 6e 74 2d 6c |oundp 'c|urrent-l|
|00000230| 6f 61 64 2d 6c 69 73 74 | 29 20 28 73 65 74 71 20 |oad-list|) (setq |
|00000240| 63 75 72 72 65 6e 74 2d | 6c 6f 61 64 2d 6c 69 73 |current-|load-lis|
|00000250| 74 20 6e 69 6c 29 29 0a | 0a 0a 28 62 79 74 65 2d |t nil)).|..(byte-|
|00000260| 63 6f 64 65 20 22 c0 09 | 42 11 c2 09 42 11 c3 09 |code "..|B...B...|
|00000270| 42 11 c4 09 42 11 c5 09 | 42 11 c6 09 42 11 c0 87 |B...B...|B...B...|
|00000280| 22 20 5b 72 63 73 2d 64 | 65 66 61 75 6c 74 2d 63 |" [rcs-d|efault-c|
|00000290| 6f 2d 73 77 69 74 63 68 | 65 73 20 63 75 72 72 65 |o-switch|es curre|
|000002a0| 6e 74 2d 6c 6f 61 64 2d | 6c 69 73 74 20 73 63 2d |nt-load-|list sc-|
|000002b0| 6d 6f 64 65 20 63 76 73 | 2d 73 68 65 6c 6c 20 63 |mode cvs|-shell c|
|000002c0| 76 73 2d 70 72 6f 67 72 | 61 6d 20 63 76 73 2d 63 |vs-progr|am cvs-c|
|000002d0| 6f 6f 6b 69 65 2d 68 61 | 6e 64 6c 65 20 65 64 69 |ookie-ha|ndle edi|
|000002e0| 66 66 2d 74 65 6d 70 2d | 66 69 6c 65 2d 70 72 65 |ff-temp-|file-pre|
|000002f0| 66 69 78 5d 20 32 29 0a | 28 64 65 66 61 6c 69 61 |fix] 2).|(defalia|
|00000300| 73 20 27 65 64 69 66 66 | 2d 76 63 2d 69 6e 74 65 |s 'ediff|-vc-inte|
|00000310| 72 6e 61 6c 20 23 5b 28 | 72 65 76 31 20 72 65 76 |rnal #[(|rev1 rev|
|00000320| 32 20 26 6f 70 74 69 6f | 6e 61 6c 20 73 74 61 72 |2 &optio|nal star|
|00000330| 74 75 70 2d 68 6f 6f 6b | 73 29 20 22 c0 89 89 89 |tup-hook|s) "....|
|00000340| 19 1a 1b 1c 8a c5 0e 06 | 21 88 70 12 c7 20 14 29 |........|!.p.. .)|
|00000350| 8a 0e 08 c9 98 ac 85 c5 | 0e 08 21 88 70 11 c7 20 |........|..!.p.. |
|00000360| 13 29 ca c0 cb 0c 44 cc | 0e 08 c9 98 cb 0b 44 45 |.)....D.|......DE|
|00000370| 46 0e 0d 42 16 0d ce 5c | 6e 09 0e 0d cf 24 2c 87 |F..B...\|n....$,.|
|00000380| 22 20 5b 6e 69 6c 20 72 | 65 76 32 62 75 66 20 72 |" [nil r|ev2buf r|
|00000390| 65 76 31 62 75 66 20 66 | 69 6c 65 32 20 66 69 6c |ev1buf f|ile2 fil|
|000003a0| 65 31 20 76 63 2d 76 65 | 72 73 69 6f 6e 2d 6f 74 |e1 vc-ve|rsion-ot|
|000003b0| 68 65 72 2d 77 69 6e 64 | 6f 77 20 72 65 76 31 20 |her-wind|ow rev1 |
|000003c0| 62 75 66 66 65 72 2d 66 | 69 6c 65 2d 6e 61 6d 65 |buffer-f|ile-name|
|000003d0| 20 72 65 76 32 20 22 22 | 20 6c 61 6d 62 64 61 20 | rev2 ""| lambda |
|000003e0| 64 65 6c 65 74 65 2d 66 | 69 6c 65 20 6f 72 20 73 |delete-f|ile or s|
|000003f0| 74 61 72 74 75 70 2d 68 | 6f 6f 6b 73 20 65 64 69 |tartup-h|ooks edi|
|00000400| 66 66 2d 62 75 66 66 65 | 72 73 20 65 64 69 66 66 |ff-buffe|rs ediff|
|00000410| 2d 72 65 76 69 73 69 6f | 6e 5d 20 37 5d 29 0a 28 |-revisio|n] 7]).(|
|00000420| 64 65 66 61 6c 69 61 73 | 20 27 72 63 73 2d 65 64 |defalias| 'rcs-ed|
|00000430| 69 66 66 2d 76 69 65 77 | 2d 72 65 76 69 73 69 6f |iff-view|-revisio|
|00000440| 6e 20 23 5b 28 26 6f 70 | 74 69 6f 6e 61 6c 20 72 |n #[(&op|tional r|
|00000450| 65 76 29 20 22 c0 70 21 | 19 c2 c3 0c ad 84 c5 0c |ev) ".p!|........|
|00000460| 50 43 5c 22 1e 06 c7 09 | 21 c8 0c c9 52 1e 5c 6e |PC\"....|!...R.\n|
|00000470| cb cc 21 88 cd 09 21 11 | 0e 5c 6e 90 ce 09 0e 5c |..!...!.|.\n....\|
|00000480| 6e 5c 22 1e 0f d0 0e 0f | 21 88 8a 0e 0f 71 88 d1 |n\".....|!....q..|
|00000490| d2 d3 d4 d5 d4 c2 0e 06 | 0e 16 d7 09 44 23 26 06 |........|....D#&.|
|000004a0| 88 2a cb d8 21 88 0e 5c | 6e 91 2b 87 22 20 5b 62 |.*..!..\|n.+." [b|
|000004b0| 75 66 66 65 72 2d 66 69 | 6c 65 2d 6e 61 6d 65 20 |uffer-fi|le-name |
|000004c0| 66 69 6c 65 6e 61 6d 65 | 20 61 70 70 65 6e 64 20 |filename| append |
|000004d0| 28 22 2d 70 22 29 20 72 | 65 76 20 22 2d 72 22 20 |("-p") r|ev "-r" |
|000004e0| 73 77 69 74 63 68 65 73 | 20 66 69 6c 65 2d 6e 61 |switches| file-na|
|000004f0| 6d 65 2d 6e 6f 6e 64 69 | 72 65 63 74 6f 72 79 20 |me-nondi|rectory |
|00000500| 22 2e 7e 22 20 22 7e 22 | 20 62 75 66 66 20 6d 65 |".~" "~"| buff me|
|00000510| 73 73 61 67 65 20 22 57 | 6f 72 6b 69 6e 67 20 2e |ssage "W|orking .|
|00000520| 2e 2e 22 20 65 78 70 61 | 6e 64 2d 66 69 6c 65 2d |.." expa|nd-file-|
|00000530| 6e 61 6d 65 20 65 64 69 | 66 66 2d 72 63 73 2d 67 |name edi|ff-rcs-g|
|00000540| 65 74 2d 6f 75 74 70 75 | 74 2d 62 75 66 66 65 72 |et-outpu|t-buffer|
|00000550| 20 6f 75 74 70 75 74 2d | 62 75 66 66 65 72 20 64 | output-|buffer d|
|00000560| 65 6c 65 74 65 2d 77 69 | 6e 64 6f 77 73 2d 6f 6e |elete-wi|ndows-on|
|00000570| 20 61 70 70 6c 79 20 63 | 61 6c 6c 2d 70 72 6f 63 | apply c|all-proc|
|00000580| 65 73 73 20 22 63 6f 22 | 20 6e 69 6c 20 74 20 72 |ess "co"| nil t r|
|00000590| 63 73 2d 64 65 66 61 75 | 6c 74 2d 63 6f 2d 73 77 |cs-defau|lt-co-sw|
|000005a0| 69 74 63 68 65 73 20 22 | 2d 71 22 20 22 22 5d 20 |itches "|-q" ""] |
|000005b0| 31 32 20 6e 69 6c 20 28 | 6c 69 73 74 20 28 69 66 |12 nil (|list (if|
|000005c0| 20 63 75 72 72 65 6e 74 | 2d 70 72 65 66 69 78 2d | current|-prefix-|
|000005d0| 61 72 67 20 28 72 65 61 | 64 2d 73 74 72 69 6e 67 |arg (rea|d-string|
|000005e0| 20 22 52 65 76 69 73 69 | 6f 6e 3a 20 22 29 29 29 | "Revisi|on: ")))|
|000005f0| 5d 29 0a 28 64 65 66 61 | 6c 69 61 73 20 27 65 64 |]).(defa|lias 'ed|
|00000600| 69 66 66 2d 72 63 73 2d | 67 65 74 2d 6f 75 74 70 |iff-rcs-|get-outp|
|00000610| 75 74 2d 62 75 66 66 65 | 72 20 23 5b 28 66 69 6c |ut-buffe|r #[(fil|
|00000620| 65 20 6e 61 6d 65 29 20 | 22 c0 19 c2 0b 21 1c 8a |e name) |"....!..|
|00000630| 0c 71 88 c5 16 06 c7 c8 | 0e 09 21 21 16 5c 6e cb |.q......|..!!.\n.|
|00000640| 20 88 29 0c 2a 87 22 20 | 5b 66 75 6e 64 61 6d 65 | .).*." |[fundame|
|00000650| 6e 74 61 6c 2d 6d 6f 64 | 65 20 64 65 66 61 75 6c |ntal-mod|e defaul|
|00000660| 74 2d 6d 61 6a 6f 72 2d | 6d 6f 64 65 20 67 65 74 |t-major-|mode get|
|00000670| 2d 62 75 66 66 65 72 2d | 63 72 65 61 74 65 20 6e |-buffer-|create n|
|00000680| 61 6d 65 20 62 75 66 20 | 6e 69 6c 20 62 75 66 66 |ame buf |nil buff|
|00000690| 65 72 2d 72 65 61 64 2d | 6f 6e 6c 79 20 66 69 6c |er-read-|only fil|
|000006a0| 65 2d 6e 61 6d 65 2d 64 | 69 72 65 63 74 6f 72 79 |e-name-d|irectory|
|000006b0| 20 65 78 70 61 6e 64 2d | 66 69 6c 65 2d 6e 61 6d | expand-|file-nam|
|000006c0| 65 20 66 69 6c 65 20 64 | 65 66 61 75 6c 74 2d 64 |e file d|efault-d|
|000006d0| 69 72 65 63 74 6f 72 79 | 20 65 72 61 73 65 2d 62 |irectory| erase-b|
|000006e0| 75 66 66 65 72 5d 20 33 | 5d 29 0a 28 64 65 66 61 |uffer] 3|]).(defa|
|000006f0| 6c 69 61 73 20 27 65 64 | 69 66 66 2d 72 63 73 2d |lias 'ed|iff-rcs-|
|00000700| 69 6e 74 65 72 6e 61 6c | 20 23 5b 28 72 65 76 31 |internal| #[(rev1|
|00000710| 20 72 65 76 32 20 26 6f | 70 74 69 6f 6e 61 6c 20 | rev2 &o|ptional |
|00000720| 73 74 61 72 74 75 70 2d | 68 6f 6f 6b 73 29 20 22 |startup-|hooks) "|
|00000730| 08 c1 98 ab 83 70 aa 83 | c2 08 21 c2 0b 21 1c 1d |.....p..|..!..!..|
|00000740| c6 0c 0d 0e 07 c8 24 2a | 87 22 20 5b 72 65 76 32 |......$*|." [rev2|
|00000750| 20 22 22 20 72 63 73 2d | 65 64 69 66 66 2d 76 69 | "" rcs-|ediff-vi|
|00000760| 65 77 2d 72 65 76 69 73 | 69 6f 6e 20 72 65 76 31 |ew-revis|ion rev1|
|00000770| 20 72 65 76 31 62 75 66 | 20 72 65 76 32 62 75 66 | rev1buf| rev2buf|
|00000780| 20 65 64 69 66 66 2d 62 | 75 66 66 65 72 73 20 73 | ediff-b|uffers s|
|00000790| 74 61 72 74 75 70 2d 68 | 6f 6f 6b 73 20 65 64 69 |tartup-h|ooks edi|
|000007a0| 66 66 2d 72 65 76 69 73 | 69 6f 6e 5d 20 35 5d 29 |ff-revis|ion] 5])|
|000007b0| 0a 28 64 65 66 61 6c 69 | 61 73 20 27 67 65 6e 65 |.(defali|as 'gene|
|000007c0| 72 69 63 2d 73 63 2d 67 | 65 74 2d 6c 61 74 65 73 |ric-sc-g|et-lates|
|000007d0| 74 2d 72 65 76 20 23 5b | 6e 69 6c 20 22 08 c1 61 |t-rev #[|nil "..a|
|000007e0| ab 84 c2 c3 21 87 c2 c4 | 21 87 22 20 5b 73 63 2d |....!...|!." [sc-|
|000007f0| 6d 6f 64 65 20 43 43 41 | 53 45 20 65 76 61 6c 20 |mode CCA|SE eval |
|00000800| 22 6d 61 69 6e 2f 4c 41 | 54 45 53 54 22 20 22 22 |"main/LA|TEST" ""|
|00000810| 5d 20 32 5d 29 0a 28 64 | 65 66 61 6c 69 61 73 20 |] 2]).(d|efalias |
|00000820| 27 65 64 69 66 66 2d 67 | 65 6e 65 72 69 63 2d 73 |'ediff-g|eneric-s|
|00000830| 63 2d 69 6e 74 65 72 6e | 61 6c 20 23 5b 28 72 65 |c-intern|al #[(re|
|00000840| 76 31 20 72 65 76 32 20 | 26 6f 70 74 69 6f 6e 61 |v1 rev2 |&optiona|
|00000850| 6c 20 73 74 61 72 74 75 | 70 2d 68 6f 6f 6b 73 29 |l startu|p-hooks)|
|00000860| 20 22 c0 89 19 1a 8a 0b | ab 85 0b c4 98 ab 83 c5 | "......|........|
|00000870| 20 13 c6 0b 21 88 70 12 | 29 8a 0e 07 c4 98 ac 85 | ...!.p.|).......|
|00000880| c6 0e 07 21 88 70 11 29 | c8 5c 6e 09 0e 09 ca 24 |...!.p.)|.\n....$|
|00000890| 2a 87 22 20 5b 6e 69 6c | 20 72 65 76 32 62 75 66 |*." [nil| rev2buf|
|000008a0| 20 72 65 76 31 62 75 66 | 20 72 65 76 31 20 22 22 | rev1buf| rev1 ""|
|000008b0| 20 67 65 6e 65 72 69 63 | 2d 73 63 2d 67 65 74 2d | generic|-sc-get-|
|000008c0| 6c 61 74 65 73 74 2d 72 | 65 76 20 73 63 2d 76 69 |latest-r|ev sc-vi|
|000008d0| 73 69 74 2d 70 72 65 76 | 69 6f 75 73 2d 72 65 76 |sit-prev|ious-rev|
|000008e0| 69 73 69 6f 6e 20 72 65 | 76 32 20 65 64 69 66 66 |ision re|v2 ediff|
|000008f0| 2d 62 75 66 66 65 72 73 | 20 73 74 61 72 74 75 70 |-buffers| startup|
|00000900| 2d 68 6f 6f 6b 73 20 65 | 64 69 66 66 2d 72 65 76 |-hooks e|diff-rev|
|00000910| 69 73 69 6f 6e 5d 20 35 | 5d 29 0a 28 64 65 66 61 |ision] 5|]).(defa|
|00000920| 6c 69 61 73 20 27 65 64 | 69 66 66 2d 76 63 2d 6d |lias 'ed|iff-vc-m|
|00000930| 65 72 67 65 2d 69 6e 74 | 65 72 6e 61 6c 20 23 5b |erge-int|ernal #[|
|00000940| 28 72 65 76 31 20 72 65 | 76 32 20 61 6e 63 65 73 |(rev1 re|v2 ances|
|00000950| 74 6f 72 2d 72 65 76 20 | 26 6f 70 74 69 6f 6e 61 |tor-rev |&optiona|
|00000960| 6c 20 73 74 61 72 74 75 | 70 2d 68 6f 6f 6b 73 20 |l startu|p-hooks |
|00000970| 6d 65 72 67 65 2d 62 75 | 66 66 65 72 2d 66 69 6c |merge-bu|ffer-fil|
|00000980| 65 29 20 22 c0 89 89 19 | 1a 1b 8a c4 0d 21 88 70 |e) "....|.....!.p|
|00000990| 13 29 8a 0e 06 c7 98 ac | 85 c4 0e 06 21 88 70 12 |.)......|....!.p.|
|000009a0| 29 0e 08 ab 8f 8a 0e 08 | c7 98 ac 85 c4 0e 08 21 |).......|.......!|
|000009b0| 88 70 11 29 c9 c0 ca cb | 0b 21 44 cc 0e 06 c7 98 |.p.)....|.!D.....|
|000009c0| ca cb 5c 6e 21 44 45 cc | 0e 08 c7 98 0e 08 3f ca |..\n!DE.|......?.|
|000009d0| cb 09 21 44 46 af 05 0e | 0d 42 16 0d 0e 08 ab 8d |..!DF...|.B......|
|000009e0| ce 0b 5c 6e 09 0e 0d cf | 0e 10 26 06 aa 89 d1 0b |..\n....|..&.....|
|000009f0| 5c 6e 0e 0d d2 0e 10 25 | 2b 87 22 20 5b 6e 69 6c |\n.....%|+." [nil|
|00000a00| 20 61 6e 63 65 73 74 6f | 72 2d 62 75 66 20 62 75 | ancesto|r-buf bu|
|00000a10| 66 32 20 62 75 66 31 20 | 76 63 2d 76 65 72 73 69 |f2 buf1 |vc-versi|
|00000a20| 6f 6e 2d 6f 74 68 65 72 | 2d 77 69 6e 64 6f 77 20 |on-other|-window |
|00000a30| 72 65 76 31 20 72 65 76 | 32 20 22 22 20 61 6e 63 |rev1 rev|2 "" anc|
|00000a40| 65 73 74 6f 72 2d 72 65 | 76 20 6c 61 6d 62 64 61 |estor-re|v lambda|
|00000a50| 20 64 65 6c 65 74 65 2d | 66 69 6c 65 20 62 75 66 | delete-|file buf|
|00000a60| 66 65 72 2d 66 69 6c 65 | 2d 6e 61 6d 65 20 6f 72 |fer-file|-name or|
|00000a70| 20 73 74 61 72 74 75 70 | 2d 68 6f 6f 6b 73 20 65 | startup|-hooks e|
|00000a80| 64 69 66 66 2d 6d 65 72 | 67 65 2d 62 75 66 66 65 |diff-mer|ge-buffe|
|00000a90| 72 73 2d 77 69 74 68 2d | 61 6e 63 65 73 74 6f 72 |rs-with-|ancestor|
|00000aa0| 20 65 64 69 66 66 2d 6d | 65 72 67 65 2d 72 65 76 | ediff-m|erge-rev|
|00000ab0| 69 73 69 6f 6e 73 2d 77 | 69 74 68 2d 61 6e 63 65 |isions-w|ith-ance|
|00000ac0| 73 74 6f 72 20 6d 65 72 | 67 65 2d 62 75 66 66 65 |stor mer|ge-buffe|
|00000ad0| 72 2d 66 69 6c 65 20 65 | 64 69 66 66 2d 6d 65 72 |r-file e|diff-mer|
|00000ae0| 67 65 2d 62 75 66 66 65 | 72 73 20 65 64 69 66 66 |ge-buffe|rs ediff|
|00000af0| 2d 6d 65 72 67 65 2d 72 | 65 76 69 73 69 6f 6e 73 |-merge-r|evisions|
|00000b00| 5d 20 31 30 5d 29 0a 28 | 64 65 66 61 6c 69 61 73 |] 10]).(|defalias|
|00000b10| 20 27 65 64 69 66 66 2d | 72 63 73 2d 6d 65 72 67 | 'ediff-|rcs-merg|
|00000b20| 65 2d 69 6e 74 65 72 6e | 61 6c 20 23 5b 28 72 65 |e-intern|al #[(re|
|00000b30| 76 31 20 72 65 76 32 20 | 61 6e 63 65 73 74 6f 72 |v1 rev2 |ancestor|
|00000b40| 2d 72 65 76 20 26 6f 70 | 74 69 6f 6e 61 6c 20 73 |-rev &op|tional s|
|00000b50| 74 61 72 74 75 70 2d 68 | 6f 6f 6b 73 20 6d 65 72 |tartup-h|ooks mer|
|00000b60| 67 65 2d 62 75 66 66 65 | 72 2d 66 69 6c 65 29 20 |ge-buffe|r-file) |
|00000b70| 22 c0 89 89 19 1a 1b c4 | 0d 21 13 0e 06 c7 98 ab |".......|.!......|
|00000b80| 83 70 aa 84 c4 0e 06 21 | 12 0e 08 ad 8d 0e 08 c7 |.p.....!|........|
|00000b90| 98 ab 83 70 aa 84 c4 0e | 08 21 11 0e 08 ab 8d c9 |...p....|.!......|
|00000ba0| 0b 5c 6e 09 0e 5c 6e cb | 0e 0c 26 06 aa 89 cd 0b |.\n..\n.|..&.....|
|00000bb0| 5c 6e 0e 5c 6e ce 0e 0c | 25 2b 87 22 20 5b 6e 69 |\n.\n...|%+." [ni|
|00000bc0| 6c 20 61 6e 63 65 73 74 | 6f 72 2d 62 75 66 20 62 |l ancest|or-buf b|
|00000bd0| 75 66 32 20 62 75 66 31 | 20 72 63 73 2d 65 64 69 |uf2 buf1| rcs-edi|
|00000be0| 66 66 2d 76 69 65 77 2d | 72 65 76 69 73 69 6f 6e |ff-view-|revision|
|00000bf0| 20 72 65 76 31 20 72 65 | 76 32 20 22 22 20 61 6e | rev1 re|v2 "" an|
|00000c00| 63 65 73 74 6f 72 2d 72 | 65 76 20 65 64 69 66 66 |cestor-r|ev ediff|
|00000c10| 2d 6d 65 72 67 65 2d 62 | 75 66 66 65 72 73 2d 77 |-merge-b|uffers-w|
|00000c20| 69 74 68 2d 61 6e 63 65 | 73 74 6f 72 20 73 74 61 |ith-ance|stor sta|
|00000c30| 72 74 75 70 2d 68 6f 6f | 6b 73 20 65 64 69 66 66 |rtup-hoo|ks ediff|
|00000c40| 2d 6d 65 72 67 65 2d 72 | 65 76 69 73 69 6f 6e 73 |-merge-r|evisions|
|00000c50| 2d 77 69 74 68 2d 61 6e | 63 65 73 74 6f 72 20 6d |-with-an|cestor m|
|00000c60| 65 72 67 65 2d 62 75 66 | 66 65 72 2d 66 69 6c 65 |erge-buf|fer-file|
|00000c70| 20 65 64 69 66 66 2d 6d | 65 72 67 65 2d 62 75 66 | ediff-m|erge-buf|
|00000c80| 66 65 72 73 20 65 64 69 | 66 66 2d 6d 65 72 67 65 |fers edi|ff-merge|
|00000c90| 2d 72 65 76 69 73 69 6f | 6e 73 5d 20 37 5d 29 0a |-revisio|ns] 7]).|
|00000ca0| 28 64 65 66 61 6c 69 61 | 73 20 27 65 64 69 66 66 |(defalia|s 'ediff|
|00000cb0| 2d 67 65 6e 65 72 69 63 | 2d 73 63 2d 6d 65 72 67 |-generic|-sc-merg|
|00000cc0| 65 2d 69 6e 74 65 72 6e | 61 6c 20 23 5b 28 72 65 |e-intern|al #[(re|
|00000cd0| 76 31 20 72 65 76 32 20 | 61 6e 63 65 73 74 6f 72 |v1 rev2 |ancestor|
|00000ce0| 2d 72 65 76 20 26 6f 70 | 74 69 6f 6e 61 6c 20 73 |-rev &op|tional s|
|00000cf0| 74 61 72 74 75 70 2d 68 | 6f 6f 6b 73 20 6d 65 72 |tartup-h|ooks mer|
|00000d00| 67 65 2d 62 75 66 66 65 | 72 2d 66 69 6c 65 29 20 |ge-buffe|r-file) |
|00000d10| 22 c0 89 89 19 1a 1b 8a | 0c c5 98 ab 83 c6 20 14 |".......|...... .|
|00000d20| c7 0c 21 88 70 13 29 8a | 0e 08 c5 98 ac 85 c7 0e |..!.p.).|........|
|00000d30| 08 21 88 70 12 29 0e 09 | ab 8f 8a 0e 09 c5 98 ac |.!.p.)..|........|
|00000d40| 85 c7 0e 09 21 88 70 11 | 29 0e 09 ab 8d ca 0b 5c |....!.p.|)......\|
|00000d50| 6e 09 0e 0b cc 0e 0d 26 | 06 aa 89 ce 0b 5c 6e 0e |n......&|.....\n.|
|00000d60| 0b cf 0e 0d 25 2b 87 22 | 20 5b 6e 69 6c 20 61 6e |....%+."| [nil an|
|00000d70| 63 65 73 74 6f 72 2d 62 | 75 66 20 62 75 66 32 20 |cestor-b|uf buf2 |
|00000d80| 62 75 66 31 20 72 65 76 | 31 20 22 22 20 67 65 6e |buf1 rev|1 "" gen|
|00000d90| 65 72 69 63 2d 73 63 2d | 67 65 74 2d 6c 61 74 65 |eric-sc-|get-late|
|00000da0| 73 74 2d 72 65 76 20 73 | 63 2d 76 69 73 69 74 2d |st-rev s|c-visit-|
|00000db0| 70 72 65 76 69 6f 75 73 | 2d 72 65 76 69 73 69 6f |previous|-revisio|
|00000dc0| 6e 20 72 65 76 32 20 61 | 6e 63 65 73 74 6f 72 2d |n rev2 a|ncestor-|
|00000dd0| 72 65 76 20 65 64 69 66 | 66 2d 6d 65 72 67 65 2d |rev edif|f-merge-|
|00000de0| 62 75 66 66 65 72 73 2d | 77 69 74 68 2d 61 6e 63 |buffers-|with-anc|
|00000df0| 65 73 74 6f 72 20 73 74 | 61 72 74 75 70 2d 68 6f |estor st|artup-ho|
|00000e00| 6f 6b 73 20 65 64 69 66 | 66 2d 6d 65 72 67 65 2d |oks edif|f-merge-|
|00000e10| 72 65 76 69 73 69 6f 6e | 73 2d 77 69 74 68 2d 61 |revision|s-with-a|
|00000e20| 6e 63 65 73 74 6f 72 20 | 6d 65 72 67 65 2d 62 75 |ncestor |merge-bu|
|00000e30| 66 66 65 72 2d 66 69 6c | 65 20 65 64 69 66 66 2d |ffer-fil|e ediff-|
|00000e40| 6d 65 72 67 65 2d 62 75 | 66 66 65 72 73 20 65 64 |merge-bu|ffers ed|
|00000e50| 69 66 66 2d 6d 65 72 67 | 65 2d 72 65 76 69 73 69 |iff-merg|e-revisi|
|00000e60| 6f 6e 73 5d 20 37 5d 29 | 0a 28 64 65 66 61 6c 69 |ons] 7])|.(defali|
|00000e70| 61 73 20 27 65 64 69 66 | 66 2d 70 63 6c 2d 63 76 |as 'edif|f-pcl-cv|
|00000e80| 73 2d 69 6e 74 65 72 6e | 61 6c 20 23 5b 28 72 65 |s-intern|al #[(re|
|00000e90| 76 31 20 72 65 76 32 20 | 26 6f 70 74 69 6f 6e 61 |v1 rev2 |&optiona|
|00000ea0| 6c 20 73 74 61 72 74 75 | 70 2d 68 6f 6f 6b 73 29 |l startu|p-hooks)|
|00000eb0| 20 22 70 c0 89 89 89 89 | 19 1a 1b 1c 1d 1e 06 c7 | "p.....|........|
|00000ec0| 70 21 89 15 ac 84 c8 c9 | 21 88 0e 5c 6e cb 98 ab |p!......|!..\n...|
|00000ed0| 83 c0 16 5c 6e cc 0d 0e | 5c 6e 5c 22 14 0e 0d cb |...\n...|\n\"....|
|00000ee0| 98 ab 84 0e 06 aa 85 cc | 0d 0e 0d 5c 22 13 c7 0c |........|...\"...|
|00000ef0| 21 12 c7 0b 21 11 ce c0 | cf 5c 6e 44 d0 0e 0d cb |!...!...|.\nD....|
|00000f00| 98 cf 09 44 45 46 0e 11 | 42 16 11 d2 0c 0b 0e 11 |...DEF..|B.......|
|00000f10| d3 24 2e 06 87 22 20 5b | 6e 69 6c 20 66 69 6c 65 |.$..." [|nil file|
|00000f20| 32 20 66 69 6c 65 31 20 | 62 75 66 32 20 62 75 66 |2 file1 |buf2 buf|
|00000f30| 31 20 6f 72 69 67 2d 66 | 69 6c 65 2d 6e 61 6d 65 |1 orig-f|ile-name|
|00000f40| 20 6f 72 69 67 2d 62 75 | 66 20 62 75 66 66 65 72 | orig-bu|f buffer|
|00000f50| 2d 66 69 6c 65 2d 6e 61 | 6d 65 20 65 72 72 6f 72 |-file-na|me error|
|00000f60| 20 22 43 75 72 72 65 6e | 74 20 62 75 66 66 65 72 | "Curren|t buffer|
|00000f70| 20 69 73 20 6e 6f 74 20 | 76 69 73 69 74 69 6e 67 | is not |visiting|
|00000f80| 20 61 6e 79 20 66 69 6c | 65 22 20 72 65 76 31 20 | any fil|e" rev1 |
|00000f90| 22 22 20 65 64 69 66 66 | 2d 70 63 6c 2d 63 76 73 |"" ediff|-pcl-cvs|
|00000fa0| 2d 76 69 65 77 2d 72 65 | 76 69 73 69 6f 6e 20 72 |-view-re|vision r|
|00000fb0| 65 76 32 20 6c 61 6d 62 | 64 61 20 64 65 6c 65 74 |ev2 lamb|da delet|
|00000fc0| 65 2d 66 69 6c 65 20 6f | 72 20 73 74 61 72 74 75 |e-file o|r startu|
|00000fd0| 70 2d 68 6f 6f 6b 73 20 | 65 64 69 66 66 2d 62 75 |p-hooks |ediff-bu|
|00000fe0| 66 66 65 72 73 20 65 64 | 69 66 66 2d 72 65 76 69 |ffers ed|iff-revi|
|00000ff0| 73 69 6f 6e 5d 20 37 5d | 29 0a 28 64 65 66 61 6c |sion] 7]|).(defal|
|00001000| 69 61 73 20 27 65 64 69 | 66 66 2d 70 63 6c 2d 63 |ias 'edi|ff-pcl-c|
|00001010| 76 73 2d 6d 65 72 67 65 | 2d 69 6e 74 65 72 6e 61 |vs-merge|-interna|
|00001020| 6c 20 23 5b 28 72 65 76 | 31 20 72 65 76 32 20 61 |l #[(rev|1 rev2 a|
|00001030| 6e 63 65 73 74 6f 72 2d | 72 65 76 20 26 6f 70 74 |ncestor-|rev &opt|
|00001040| 69 6f 6e 61 6c 20 73 74 | 61 72 74 75 70 2d 68 6f |ional st|artup-ho|
|00001050| 6f 6b 73 20 6d 65 72 67 | 65 2d 62 75 66 66 65 72 |oks merg|e-buffer|
|00001060| 2d 66 69 6c 65 29 20 22 | 70 c0 89 89 89 19 1a 1b |-file) "|p.......|
|00001070| 1c 1d c6 70 21 89 14 ac | 84 c7 c8 21 88 0e 09 ca |...p!...|...!....|
|00001080| 98 ab 83 c0 16 09 cb 0c | 0e 09 5c 22 13 0e 0c ca |........|..\"....|
|00001090| 98 ab 83 0d aa 85 cb 0c | 0e 0c 5c 22 12 0e 0d 3b |........|..\"...;|
|000010a0| ab 8f 0e 0d ca 98 ab 83 | 0d aa 85 cb 0c 0e 0d 5c |........|.......\|
|000010b0| 22 11 ce c0 cf c6 0b 21 | 44 d0 0e 0c ca 98 cf c6 |"......!|D.......|
|000010c0| 5c 6e 21 44 45 d0 0e 0d | ca 98 0e 0d 3f cf c6 09 |\n!DE...|....?...|
|000010d0| 21 44 46 af 05 0e 11 42 | 16 11 09 ab 8d d2 0b 5c |!DF....B|.......\|
|000010e0| 6e 09 0e 11 d3 0e 14 26 | 06 aa 89 d5 0b 5c 6e 0e |n......&|.....\n.|
|000010f0| 11 d6 0e 14 25 2d 87 22 | 20 5b 6e 69 6c 20 61 6e |....%-."| [nil an|
|00001100| 63 65 73 74 6f 72 2d 62 | 75 66 20 62 75 66 32 20 |cestor-b|uf buf2 |
|00001110| 62 75 66 31 20 6f 72 69 | 67 2d 66 69 6c 65 2d 6e |buf1 ori|g-file-n|
|00001120| 61 6d 65 20 6f 72 69 67 | 2d 62 75 66 20 62 75 66 |ame orig|-buf buf|
|00001130| 66 65 72 2d 66 69 6c 65 | 2d 6e 61 6d 65 20 65 72 |fer-file|-name er|
|00001140| 72 6f 72 20 22 43 75 72 | 72 65 6e 74 20 62 75 66 |ror "Cur|rent buf|
|00001150| 66 65 72 20 69 73 20 6e | 6f 74 20 76 69 73 69 74 |fer is n|ot visit|
|00001160| 69 6e 67 20 61 6e 79 20 | 66 69 6c 65 22 20 72 65 |ing any |file" re|
|00001170| 76 31 20 22 22 20 65 64 | 69 66 66 2d 70 63 6c 2d |v1 "" ed|iff-pcl-|
|00001180| 63 76 73 2d 76 69 65 77 | 2d 72 65 76 69 73 69 6f |cvs-view|-revisio|
|00001190| 6e 20 72 65 76 32 20 61 | 6e 63 65 73 74 6f 72 2d |n rev2 a|ncestor-|
|000011a0| 72 65 76 20 6c 61 6d 62 | 64 61 20 64 65 6c 65 74 |rev lamb|da delet|
|000011b0| 65 2d 66 69 6c 65 20 6f | 72 20 73 74 61 72 74 75 |e-file o|r startu|
|000011c0| 70 2d 68 6f 6f 6b 73 20 | 65 64 69 66 66 2d 6d 65 |p-hooks |ediff-me|
|000011d0| 72 67 65 2d 62 75 66 66 | 65 72 73 2d 77 69 74 68 |rge-buff|ers-with|
|000011e0| 2d 61 6e 63 65 73 74 6f | 72 20 65 64 69 66 66 2d |-ancesto|r ediff-|
|000011f0| 6d 65 72 67 65 2d 72 65 | 76 69 73 69 6f 6e 73 2d |merge-re|visions-|
|00001200| 77 69 74 68 2d 61 6e 63 | 65 73 74 6f 72 20 6d 65 |with-anc|estor me|
|00001210| 72 67 65 2d 62 75 66 66 | 65 72 2d 66 69 6c 65 20 |rge-buff|er-file |
|00001220| 65 64 69 66 66 2d 6d 65 | 72 67 65 2d 62 75 66 66 |ediff-me|rge-buff|
|00001230| 65 72 73 20 65 64 69 66 | 66 2d 6d 65 72 67 65 2d |ers edif|f-merge-|
|00001240| 72 65 76 69 73 69 6f 6e | 73 5d 20 31 30 5d 29 0a |revision|s] 10]).|
|00001250| 28 64 65 66 61 6c 69 61 | 73 20 27 65 64 69 66 66 |(defalia|s 'ediff|
|00001260| 2d 70 63 6c 2d 63 76 73 | 2d 76 69 65 77 2d 72 65 |-pcl-cvs|-view-re|
|00001270| 76 69 73 69 6f 6e 20 23 | 5b 28 66 69 6c 65 20 72 |vision #|[(file r|
|00001280| 65 76 29 20 22 c0 09 c2 | 0b 51 21 1c c5 0c 21 88 |ev) "...|.Q!...!.|
|00001290| 0b ab 87 c6 c7 0b 5c 22 | 88 aa 84 c6 c8 21 88 c9 |......\"|.....!..|
|000012a0| 0e 5c 6e cb 89 89 cc 0e | 0d ce 0b ab 86 cf 0b d0 |.\n.....|........|
|000012b0| 51 aa 81 d1 0e 12 d3 0c | b0 06 26 06 89 1e 14 ab |Q.......|..&.....|
|000012c0| 91 0e 14 a8 ab 86 0e 14 | d5 55 ac 86 d6 d7 0e 14 |........|.U......|
|000012d0| 5c 22 88 0b ab 87 c6 d8 | 0b 5c 22 88 aa 84 c6 d9 |\"......|.\".....|
|000012e0| 21 88 da 0c 21 2a 87 22 | 20 5b 6d 61 6b 65 2d 74 |!...!*."| [make-t|
|000012f0| 65 6d 70 2d 6e 61 6d 65 | 20 65 64 69 66 66 2d 74 |emp-name| ediff-t|
|00001300| 65 6d 70 2d 66 69 6c 65 | 2d 70 72 65 66 69 78 20 |emp-file|-prefix |
|00001310| 22 65 64 69 66 66 5f 22 | 20 72 65 76 20 74 65 6d |"ediff_"| rev tem|
|00001320| 70 2d 6e 61 6d 65 20 63 | 76 73 2d 6b 69 6c 6c 2d |p-name c|vs-kill-|
|00001330| 62 75 66 66 65 72 2d 76 | 69 73 69 74 69 6e 67 20 |buffer-v|isiting |
|00001340| 6d 65 73 73 61 67 65 20 | 22 52 65 74 72 69 65 76 |message |"Retriev|
|00001350| 69 6e 67 20 72 65 76 69 | 73 69 6f 6e 20 25 73 2e |ing revi|sion %s.|
|00001360| 2e 2e 22 20 22 52 65 74 | 72 69 65 76 69 6e 67 20 |.." "Ret|rieving |
|00001370| 6c 61 74 65 73 74 20 72 | 65 76 69 73 69 6f 6e 2e |latest r|evision.|
|00001380| 2e 2e 22 20 63 61 6c 6c | 2d 70 72 6f 63 65 73 73 |.." call|-process|
|00001390| 20 63 76 73 2d 73 68 65 | 6c 6c 20 6e 69 6c 20 22 | cvs-she|ll nil "|
|000013a0| 2d 63 22 20 63 76 73 2d | 70 72 6f 67 72 61 6d 20 |-c" cvs-|program |
|000013b0| 22 20 75 70 64 61 74 65 | 20 2d 70 20 22 20 22 2d |" update| -p " "-|
|000013c0| 72 20 22 20 22 20 22 20 | 22 22 20 66 69 6c 65 20 |r " " " |"" file |
|000013d0| 22 20 3e 20 22 20 72 65 | 73 20 30 20 65 72 72 6f |" > " re|s 0 erro|
|000013e0| 72 20 22 46 61 69 6c 65 | 64 20 74 6f 20 72 65 74 |r "Faile|d to ret|
|000013f0| 72 69 65 76 65 20 72 65 | 76 69 73 69 6f 6e 3a 20 |rieve re|vision: |
|00001400| 25 73 22 20 22 52 65 74 | 72 69 65 76 69 6e 67 20 |%s" "Ret|rieving |
|00001410| 72 65 76 69 73 69 6f 6e | 20 25 73 2e 2e 2e 20 44 |revision| %s... D|
|00001420| 6f 6e 65 2e 22 20 22 52 | 65 74 72 69 65 76 69 6e |one." "R|etrievin|
|00001430| 67 20 6c 61 74 65 73 74 | 20 72 65 76 69 73 69 6f |g latest| revisio|
|00001440| 6e 2e 2e 2e 20 44 6f 6e | 65 2e 22 20 66 69 6e 64 |n... Don|e." find|
|00001450| 2d 66 69 6c 65 2d 6e 6f | 73 65 6c 65 63 74 5d 20 |-file-no|select] |
|00001460| 31 33 5d 29 0a 28 64 65 | 66 61 6c 69 61 73 20 27 |13]).(de|falias '|
|00001470| 63 76 73 2d 72 75 6e 2d | 65 64 69 66 66 2d 6f 6e |cvs-run-|ediff-on|
|00001480| 2d 66 69 6c 65 2d 64 65 | 73 63 72 69 70 74 6f 72 |-file-de|scriptor|
|00001490| 20 23 5b 28 74 69 6e 29 | 20 22 c0 09 5c 6e 5c 22 | #[(tin)| "..\n\"|
|000014a0| 1b c4 0b 21 1d c6 0b 21 | 1e 07 c8 c9 0b 21 21 1e |...!...!|.....!!.|
|000014b0| 5c 6e cb 1e 0c 0d cd 73 | ac 84 ce cf 21 88 0d d0 |\n.....s|....!...|
|000014c0| 73 ab 9c c6 0b d1 0b 21 | 5c 22 16 0c d2 d3 0e 07 |s......!|\"......|
|000014d0| 21 d3 d4 0b 21 21 d3 0e | 0c 21 cb d5 25 88 aa 93 |!...!!..|.!..%...|
|000014e0| 0d d6 61 ab 8e d7 d3 0e | 07 21 d3 d8 0b 21 21 cb |..a.....|.!...!!.|
|000014f0| d9 24 88 0e 07 3b ab 85 | da 0e 07 21 88 0e 0c 3b |.$...;..|...!...;|
|00001500| ad 84 da 0e 0c 21 2d 87 | 22 20 5b 74 69 6e 2d 63 |.....!-.|" [tin-c|
|00001510| 6f 6f 6b 69 65 20 63 76 | 73 2d 63 6f 6f 6b 69 65 |ookie cv|s-cookie|
|00001520| 2d 68 61 6e 64 6c 65 20 | 74 69 6e 20 66 69 6c 65 |-handle |tin file|
|00001530| 69 6e 66 6f 20 63 76 73 | 2d 66 69 6c 65 69 6e 66 |info cvs|-fileinf|
|00001540| 6f 2d 3e 74 79 70 65 20 | 74 79 70 65 20 63 76 73 |o->type |type cvs|
|00001550| 2d 72 65 74 72 69 65 76 | 65 2d 72 65 76 69 73 69 |-retriev|e-revisi|
|00001560| 6f 6e 2d 74 6f 2d 74 6d | 70 66 69 6c 65 20 74 6d |on-to-tm|pfile tm|
|00001570| 70 2d 66 69 6c 65 20 66 | 69 6c 65 2d 6e 61 6d 65 |p-file f|ile-name|
|00001580| 2d 61 73 2d 64 69 72 65 | 63 74 6f 72 79 20 63 76 |-as-dire|ctory cv|
|00001590| 73 2d 66 69 6c 65 69 6e | 66 6f 2d 3e 64 69 72 20 |s-filein|fo->dir |
|000015a0| 64 65 66 61 75 6c 74 2d | 64 69 72 65 63 74 6f 72 |default-|director|
|000015b0| 79 20 6e 69 6c 20 61 6e | 63 65 73 74 6f 72 2d 66 |y nil an|cestor-f|
|000015c0| 69 6c 65 20 28 4d 45 52 | 47 45 44 20 43 4f 4e 46 |ile (MER|GED CONF|
|000015d0| 4c 49 43 54 20 4d 4f 44 | 49 46 49 45 44 29 20 65 |LICT MOD|IFIED) e|
|000015e0| 72 72 6f 72 20 22 43 61 | 6e 20 6f 6e 6c 79 20 6d |rror "Ca|n only m|
|000015f0| 65 72 67 65 20 60 4d 6f | 64 69 66 69 65 64 27 2c |erge `Mo|dified',|
|00001600| 20 60 4d 65 72 67 65 64 | 27 20 6f 72 20 60 43 6f | `Merged|' or `Co|
|00001610| 6e 66 6c 69 63 74 27 20 | 66 69 6c 65 73 22 20 28 |nflict' |files" (|
|00001620| 4d 45 52 47 45 44 20 43 | 4f 4e 46 4c 49 43 54 29 |MERGED C|ONFLICT)|
|00001630| 20 63 76 73 2d 66 69 6c | 65 69 6e 66 6f 2d 3e 62 | cvs-fil|einfo->b|
|00001640| 61 73 65 2d 72 65 76 69 | 73 69 6f 6e 20 65 64 69 |ase-revi|sion edi|
|00001650| 66 66 2d 6d 65 72 67 65 | 2d 62 75 66 66 65 72 73 |ff-merge|-buffers|
|00001660| 2d 77 69 74 68 2d 61 6e | 63 65 73 74 6f 72 20 66 |-with-an|cestor f|
|00001670| 69 6e 64 2d 66 69 6c 65 | 2d 6e 6f 73 65 6c 65 63 |ind-file|-noselec|
|00001680| 74 20 63 76 73 2d 66 69 | 6c 65 69 6e 66 6f 2d 3e |t cvs-fi|leinfo->|
|00001690| 62 61 63 6b 75 70 2d 66 | 69 6c 65 20 65 64 69 66 |backup-f|ile edif|
|000016a0| 66 2d 6d 65 72 67 65 2d | 72 65 76 69 73 69 6f 6e |f-merge-|revision|
|000016b0| 73 2d 77 69 74 68 2d 61 | 6e 63 65 73 74 6f 72 20 |s-with-a|ncestor |
|000016c0| 4d 4f 44 49 46 49 45 44 | 20 65 64 69 66 66 2d 62 |MODIFIED| ediff-b|
|000016d0| 75 66 66 65 72 73 20 63 | 76 73 2d 66 69 6c 65 69 |uffers c|vs-filei|
|000016e0| 6e 66 6f 2d 3e 66 75 6c | 6c 2d 70 61 74 68 20 65 |nfo->ful|l-path e|
|000016f0| 64 69 66 66 2d 72 65 76 | 69 73 69 6f 6e 73 20 64 |diff-rev|isions d|
|00001700| 65 6c 65 74 65 2d 66 69 | 6c 65 5d 20 36 5d 29 0a |elete-fi|le] 6]).|
|00001710| 28 70 72 6f 76 69 64 65 | 20 27 65 64 69 66 66 2d |(provide| 'ediff-|
|00001720| 76 65 72 73 29 0a | |vers). | |
+--------+-------------------------+-------------------------+--------+--------+
